Misc Fixes - DO NOT MERGE review first

A few open points for discussion in here...