Last minute changes before alpha release