Fix errors from adding classical-only button