Some user fixes