Incorporate some sqlscript updates from FPC trunk