Fixing a couple of outstanding issues