More package interaction fixes...