Misc commits after LAN change