If possible, try to minimize any chit-chat that gets personal. No more comments about sleeping on the landing, for example. My guess is he is clumsily flirting or something, and finds the idea of you getting 'in trouble' to be a turn-on. Don't give him anything.