[PATCH 0/2] Fix for selftest