Fixes from @mcollina website.