Fix some more errors in SW