Fix things mentioned in 52412b6