Minor API corrections.