Apparmor service fixes