Fix Buffer instantiation