Various fixes because of package renaming