Fixed issues that resulted from updating branch