Fix for some build errors.