Fixes for gpac.