Fix latest changes derps finally