Fix bugs so Anlar works correctly