Minor structural updates