[devel] fixes