More fix and improvement to compil out of the box