Fixing a couple of badgets