Fody - little fixes