fixes for aeolus