Some buffer and conditional statement changes.