Fix some other conditionnal compilation issues