Fixing WCS data access. Small cleanups.