Fixes minor assumptions