Small bugfixes

RM4825