Yash fixes