Fixed stuff I broke before