Bugs fixes for 6.3 patch