Fix fromString, tweak types