fixes in mode2 support