Cleanups, add some more error callbacks