added several fixes for noapp option