Fixed issues before first release