Fix small isolateScope issues