Clean up gcc -Wimplicit  warnings