Fixes after interesting merge.