Some simple fixes