various fixes

Various fixes and package renames