AppMan fixes and improvements...