Move stuff around for undefsan