Fixes per review
Fixes per review