Import fixes for latest Forge update