Has some small bug fixes