Bug fixes part Thrice