Fix user bugs