More work on updating to latest forge