Fixes for devise