more simple fixes