Pre release fixes

Avoid inline comments.