Fix Devise compatibility errors and style!!