Bug fixes for non-ec2 packaging.