TEMPUS: Basic Fixes

Basic Fixes