Fixes for AWS use