Fixes per review feedback