DB/Auth Fix