Fixing buffer sizes