Minor dotman fixes, need to use upstream soon