fix compilation failures, partial gmutex deprecations fix