Bug fix and added some NCX params.