bug fixes and handling of critical symbols