Fixes so that it compiles