CS and import fixes