Fixes based on updates on SC Plugins