Added a few small fixes.