Fixed known bugs.