Small fixes for emagging robots