Regex fixes

Some fixes for comments.