Fix Forge flag files not always being created