Applied a few fixes.