yet more type fixing
yet more type fixing