Removed some bugs that caused EXS to crash.