Note recent changes
Assertion for clang scan
Fixes for clang scan