Fixes for regexp.