Minor changes & fixes