FE: Fixing issues after refactoring