src and compatability layer updates