a few simple fixes