fixed bugs generated at aws