Fix build not compiling correctly
More changes