Some tweaks based on recent struct changes