More work on undef values