fixes for alpha issues