some fixes (keep SM2 happy, ...)