[CA/AE] - fixes

... fixes stuff - see commit messages