[devel] minor fixes