Made correct buffer sizes