20 regex fixes