More work on BuildCraft support