Fixes dependencies for messages