Made small fixes, to subtle things that broke the debugger in a weird way