fix packaging control and messaging