Simple fixes based on pr comments