Few fixes/adds