Forgot some fixes I made