Fixing minor problems with messages extraction
Removing usage of deprecated methods