MAS and CB fixes and links