more pkg fixes