more application issues fixed