Add flock. Test for codecs.