Fixes for AWS