Committing small bug fixes and updates