Minor bugfixes and package rename