more spindle compatibility fixes

Auditors: blackmad