Nukes legacy changes upon rebase

Fixes #337