Fix some more leftovers. Everything works as expected now.