Fix some issues

subj