Fixes for robert