A few more long -> slong