[PATCH 0/2] Fixes for get 4GB pyra working