Small fixes. Nothing facy