small fixes on convert