Fixes for debugging