Changes needed for cl2000 compiler to work

This one finally looks good.