Fixes based on Noris comments.