Code change to remove compiler warnings