Correct bugs found in Alpha testing