Apply comments from @btm