Small fixes to fix change to any type