Fixed errors w/ newer Forge versions