CS fixes

Signed-off-by: Graham Campbell <graham@mineuk.com>