Fix for building problems