Fixing when no DB functions are present