Fix build some more