Misc fixes pertaining to complex numbers