Fix to remove compiler warnings