Minor improvements based in the information from the compilation with
GCC