Multiple fixes within aweplug

fixes DEVELOPER-1072
fixes DEVELOPER-1093
fixes DEVELOPER-1092