Bug fix, devdel improvement