Riversdale, CML Building get heritage funding