A few fixes to get system running.