Small improvements & fixes