Working fixes from robot