Add some debug checks and info