Fixed stuff I broke