Fixed stuff that was broken