Small fixes for V2.0.0 release. Preview and alfa remove fixes