Further fixes and Pem8 adherence (mostly).