Build issues

Fix for build issues.