Some compiler warnings fixed.