Fixes after Dan's Comments