Other fixes

- Caused by the Module on AA