final fix for sysprefs merge, hopefully