Last fixes for clearkey