Fixes related to the way on how Amazon EC2 works