More porting, config and block references left