Fix somethings hopefully