Fix some smell bugs