Some fixes like 0.0 in Z