(Not very) Strict code lint check and some minor issues fixed

No, this is an error (mine) :)