Apply Casey fixes