Fix dodgy typing