Fix all API & finder bugs