Small fixes (or the opposite)