final compilation error fixes.