More porting work. Gotta love how things change randomly.