Fixes based on Mathieu's review