Fixes for aramni