Fixing some stuff, will run on c3se.