Minor regex bugs