Further monkey patches around boto