Fixes to correctly handle additional EBS volumes