Small changes & fixes