Some fixes [Final]