fix(AAE): minor fixes

Mike Hoang requested to merge mike/epic_fix into epic/AAE

Merge request reports