Minor bugfixes

subj