Yet more debug stuff I forgot to get rid of