Path and cmd fix