Fixed some issues, mainly related to the symbols