Some minor changes to help aid in porting; mostly non-functional changes