Some fixes for the latest rsearch changes