Fix buttons and externals. Closes #2437.