Set a few minor bugs fixes.