xgkick fixes - experimental