Minor fixes, preparing for refactor and KGW Fix