Fixes and inspection pass.