Hot fixes and cleaning
Last update