baseUrl and buffer syntax corrections