[NUCRDBMS-672] Minor updates to adapter