fixes in aws