Add some debugging aids