Fixes to meet appfog requirements