Fix: General correctness and valid usage issues.