Minor fixes (during brooklyn-cdh vcloud work)