Consistency in calling backtrace_locations
Fix some errors in real_stack_size
Merge some changes I forgot to push