Fix path and review comments