[RFC] Progress since last merge

These are the necessary fixes before I could continue with login-box.