Some changes to meet AppFog needs