Few small bug fixes.