horde: small cleanups