Few very small bug fixes