Fix compile time compatibility with new and old forge