Add quotes, fix build system