Fix bugs. Alpha build