Fixed issues for 1.0 release