Compilation fix and KGW