Issues fixed, caught by latest static analyzer update… need to pull in the latest stable branch soon...