Fixed some errors where the user_id was still being used