Set ANSIOFFSET=1 and minor changes