Fixed timeout failures and rebased to current master.