few simple fixes