Final compiling fixes made.