Some other minor issues fixed