Fixes latest comments