Small fixes for codec restriction.