Various fixes, better backtraces