Bug fixes and CS/Dataform updates