Fix build troubles