Again, small bug fixes.