Small fixes everywhere