Finishing activity messages i18n
Small fixes