Some subtle fixes (should not break anything)