Fix package warts