Recommendation: minor fixes