Couple of changes for compatibility with gcc