Fixed issues after running yard