VYAG-43: fixes as per the pull request comments
VYAG-43: fixes as per the pull request comments

leapfrogtechnology/vyaguta-resource,leapfrogtechnology/vyaguta-resource,leapfrogtechnology/vyaguta-resource