Minor bugfixes because of package relocation