Fixed "Command not found" issues