Minor fixes and "tie" message