cleaned up conversion warnings