Some other minor issues

Some other minor issues