[fix] Handle path correctly + syntax fixes