Some bug fixes.
Fixed contrib.shell again.