Add stuff useful for debugging