Fixes for incorrect message position