Various fixes/updates