I think you should joke more, ideally in the presence of HR. They will sort it out.