Adjustments after package build / check