Minor adjustments to make sure it is builds correctly.