More buildroot fixes.