fixes to run on cs.org