Login
Fix a few miscellaneous self violations