Value conversion fixes