Fixes and comments per PR notes.