some fixes for smr-ec2