Minor fixes. EmailClient should work now, might need minor fix.