[FOLD] More small cleanups