Fixes to result