Fixes for boto dependencies