fixes from real cms install test