Fixed weirdo stuff