Fixed references to SELF.content