Thanks. Fixed them both. Regex fail :)