Fix settings save and some packaging issues