More small bug fixes.