Fixes after review
Marge fixes
Additional fix related to previous merge.