Initial fixes to support redshift