Fixed some more goof ups.