Merged Michael's tile timeout changes.