Fixes minor issues in the Engine