More AE2 bug-fixes