Short transit test, bug fixes.