Dirty little fixes