Some changes based on suse feedback.