Fix couple things