Fix building problems