Yay little fixes