Fix z issue and local configure issue