Changes for compiler