Attempted fix for warnings in framework.