Add fixes requested in comments