minor fix for recent Linux / gcc compat changes, and runastyle