bug fixes in button adapters