Maybe fixed two conversion issues.