Small fixes
Removed unnecessary override mixin