Tiny fixes. Nothing major YET