Fixed AWS image issues