Fix a few errors/update a few things from 2.x

Fix up classnames and remove no longer needed version checks.