Fixes on normalize