... and fix references