Fixed issues in Rev 2