user fixes