Updated some conversions and throwables