Add some assert()'s back
Fix some more warnings I saw in the travis-ci gcc build