Fixed smaller bugs.