Some fixes on issues that appeared on a new gcc version