Mixed bag of fixes