Updated generated files, made some fixes.