Fix scripts to remove compiler warnings