Fix typos and add quotes, potentially fix build failures with ccache (#2533)