Fixing build

Please, anyone. Merge this cleanup.