* FIX: Minor packaging issues