Updated to upstream pycompilation