Fixes based on comments