several small package fixes