Minor fixes regarding Messages Controller