RC5 bugfixes

- See #479