more package inference fixes