Fix bugs during alfa testing