Bugfixes and refactoring resolution

## Ready State: No