Fixes for professional clarity