Some more bionic fixes.