Added some courtesies