Remove some unnecessary warnings and add REQUIRE where its needed