Bug fixes for first release