Some corrections after switching to new repository