Revised few stuff to compile again