Fix issues with PR #1011

See https://github.com/BuildCraft/BuildCraft/issues/1011