Fixed a few issues with greetings