Minor fixes fixed