Merge pull request #748 from claudioandre/bleeding-jumbo

A few tweaks
OpenCL: Ensure AMD device topology output despite outdated headers.
Small tweaks.