Fixed things @peterbe found.