Merge "Fix minor bugs"