Fixes, returned to jsmorley way with ReturnValue.