Further package-specific hacks