Ticket #132 - adding bigger timeouts for view changes