Enhance dev env

Some trivial amendments.