Fixed stuff (hopefully...)