master fixes + gso applied