Added some conversions I forgot