fusion-friendly fixes