various fixes

Subj.