Corrections to match best practices