Some more live debugging fixes