Linux/mac buildfix attempt