Bug fixes, mostly.