fixes for recent package change.