Fix some issues found during smoke testing