Fix exporting and importing XBlock