Apply mscdex comments