Bug fixes on test version