Fix some Firebird issues, and make util class available from the Query Builder class