Fixes for alpha7.3