user bug fixes