Fixed compile errors with forge #504