A few simple fixes