Fixes from robot