[PATCH 0/2] Two fixes for Armada