Addressing @abergeron valid comments for fixes