Very small fixes
Very small fixes + ooops