few more simple fixes