Some fixes Ronny suggested