Small changes for beta test. Fix for Canvas Login.