Crp

Trivial fixes.