Added fixes for known issues with ApplyBootMedia