Fixed scope data binding issues