Some more fixes @vaibhav121