Mark some stuff for porting down the road