Fix minor issues and stuff I didn't mean to commit