TEMPUS: Basic fixes.

Basic fixes.