Fix more stuff after @maranda commit