More fixes, cause I screwed up more