Crystal Eyes: General fixes.

General fixes.