Fixing dumb stuff