Fix stuff for building