Resolved buffer issues