Correct minor bugs resulting from connection problem commit