Very small fixes + ooops