One more fix

#2585 
And more syringey stuff.