More little finicky fixes