Small fixes APPS-232