Fix variable types in Granulate