Better debugging fixes