Gcc fixes - typenames.