Remove dup include of Makefile.lib
Pass incorrect query status back to svp callbacks