Fixes to allow remote draw loading