Some APIs were broken.. Fixed.