SimpleDB Lock timeout fixes