zs fixes to make the build work