scam: few fixes for recent commit