Fixed issues. Updated versions