Updates and type fix