Fixes/authentication