Minor front-end module fixes

Reduced the number of redundant calls by front end modules.