Fixed substitution and date manipulation