Fixes and improvements for root