Simple bug fixes with accept button.