Working now with Oleg's last round of fixes.
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>