Fixes again

Makes the current master build and work to some extent