Fixing the refactorings needed for merge # 50