callstack disabled + fixes