Minor fixes related to compilation and hash mutex