Small improvements in Front-end Implementation.