Fixes for alda