Multiple fixes within aweplug

fixes DEVELOPER-1072
fixes DEVELOPER-1093
fixes DEVELOPER-1092
Merge pull request #663 from LightGuard/aweplug-updates-2014-11-19

Multiple fixes within aweplug