-Minor fixes