minor fixes to aws12