Begin alpha bugfixs