Fixes & adaptations after packaging