Additional fixes for devise login stuff