All fixes before alpha version released