Apply fixes from Carlos Galdino to website