Make more stuff work!