LOW / Fixed compile errors after connie refactoring