Changes & fixes
Changes & fixes