Merge Fixes

Fixes issues post merge and and with minor sanity checks and neatness.