Work and user fixes