Updated to build static, statically