REVERT - Debugging tweaks