A few fixes, powered by logos