More features fixes