Bugs fixes for 6.4