Updated types to fit recent change to compiler