Fixed remaining bugs from conversion