Fixes and updates for pilot-12