Fixes to remove synchronous createBuffer() calls