More fix ups yay