Fix some forgotten things