Some another fixes