Code update to remove compiler warnings