Fix some minor issues I found