fix compiling issues with lang changes