Correct bugs (compile !)