Fixes for package control