Fixes bugs in messages partial