Fixed, both of these