Fixed some whatevers