Minor fixes more