Some compiler warnings resolved.