a couple basic fixes