scody-default-master fixes