Some other minor fixes