Bugfixes for AWS Header