More work towards better Convert methods