More attempts to remove timeouts; Fix for snapshots extension