Touch ups after 2.7.5 Testing