fixes new compilation issues