Fixed a number of issues with Z and r2c_one