Fixed issues with Master