add fixes for a couple packages