Fix build issues

There may still be runtime ones though