[PATCH 0/3] Random improvements