Fixes based on critique