Small updates (and fixes)