Resolved several reported Gandarme issues.