Various fixes, c9 name change