Fixed few mistakes made between two last merges.