makefile and dbinit changes