Fixes/hd export