Misc fixes as suggested by Bronson