Clean several compilation warnings draft

Fix SHIFT and code cleanup draft

(0) -30 -10 -2 +2 tip

mercurial