Corrected building error.

Added code needed for upcoming features.