first simple fixes