Buffer parameters and constructor fixes