Fix directory and commands