Bugs & fixes

If any issue with Phaze make a ticket here.