DB directory, basic format fixes