Fixed build and normalization.