Fix non-aot build errors