Fixing some more bugs with /aec