shell bug fixes