Fixed compilation, broken linking