fixes for package usage!