Packaging fixes for 0.02