Some general fixes for other users + comments.