Just few cleans and fixes