more re-packaging, warning fixes and suppression