Fix compilation errors (missing cond here and there etc...)