Fix somethings