Fixed some stuff

Specific, I know.