Fixed buffer button errors