Fixing translation issues (refs: #558 and #545)