Further FindBugs fixes
Address masked fields FindBugs warning
Add missing ec2 mock expectations

Regression from 8f8b6dd.