Several minor fixes and changes