initial changes to ensure compatibility with 0.8+
Initial changes to ensure compatibility with Anchor 0.8+