Fixing compilation problems ?!?