Logical and CS fixes.