More user fixes etc.