App system fixes