Fixed aws stuff