[PATCH 0/2] Trivial warning fixes