Other small changes & fixes