Fixes for alpha2