Fixes for more robust gitlabel regexp