A few more stuff fixed before the evening
A few more stuff fixed before the evening