Minor fixes

So many stuff. Shame on me