Some fixes/updates