merge scotts fixes