Fix per review comments