Fixes based on Pauls comments. Part 2