Minor improvements shell interactive