Misc usage fixes