Syntax and path fixes