packaging related fixes