Minor improvements wr.t. Conversion