Updated to fix compiler warnings occurring with recent gcc versions.