Zone API & minor fixes