Tidy up for Syno packaging