Resolve 2 of 3 suggestions from Roman