Fixing some hang-over references to removed packages