Fixes for emagging robots