Small changes here and there

Nothing special!