more regexp fixes