Fixes based on Pauls comments