Small fixes/updates