Fixing mistake in Display and working towards resolving BASE(F) issues with SWIG