Aws and bugfixes