Core pr 5

Minor fixes.
Comment have been updated: This will ensure that the changes are reflected at once and for all users (this will also clear varnish cache).