Minor fixes in Drawable and Buffer