Fixed some issus.