Fixes minor issues