Small Changes for Compiler