Couple of more adjustments and console log fixes