Fixed stuff from the last update