Fixes based on testing