Some another fixes...