Fixed some dumb problems ...