Fixed other regex problems