Fixes for alpha 11