messages & fixed dep