Updated some small bug fixes