- Fix several issues introduced in last days