cnat: fixes & prepare maglev