Qucik fixes